Autogenerated HTML docs for v1.5.4.3-484-g60e3
diff --git a/config.txt b/config.txt index 4027726..c5e094a 100644 --- a/config.txt +++ b/config.txt
@@ -556,6 +556,11 @@ `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it). +format.pretty:: + The default pretty format for log/show/whatchanged command, + See linkgit:git-log[1], linkgit:git-show[1], + linkgit:git-whatchanged[1]. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults @@ -749,8 +754,10 @@ merge.tool:: Controls which merge resolution program is used by - linkgit:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". + linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "opendiff". Any other value is treated is custom merge tool + and there must be a corresponing mergetool.<tool>.cmd option. merge.verbosity:: Controls the amount of output shown by the recursive merge @@ -777,6 +784,31 @@ Override the path for the given tool. This is useful in case your tool is not in the PATH. +mergetool.<tool>.cmd:: + Specify the command to invoke the specified merge tool. The + specified command is evaluated in shell with the following + variables available: 'BASE' is the name of a temporary file + containing the common base of the files to be merged, if available; + 'LOCAL' is the name of a temporary file containing the contents of + the file on the current branch; 'REMOTE' is the name of a temporary + file containing the contents of the file from the branch being + merged; 'MERGED' contains the name of the file to which the merge + tool should write the results of a successful merge. + +mergetool.<tool>.trustExitCode:: + For a custom merge command, specify whether the exit code of + the merge command can be used to determine whether the merge was + successful. If this is not set to true then the merge target file + timestamp is checked and the merge assumed to have been successful + if the file has been updated, otherwise the user is prompted to + indicate the success of the merge. + +mergetool.keepBackup:: + After performing a merge, the original file with conflict markers + can be saved as a file with a `.orig` extension. If this variable + is set to `false` then this file is not preserved. Defaults to + `true` (i.e. keep the backup files). + pack.window:: The size of the window used by linkgit:git-pack-objects[1] when no window size is given on the command line. Defaults to 10. @@ -864,15 +896,15 @@ remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See - option \--exec of linkgit:git-push[1]. + option \--receive-pack of linkgit:git-push[1]. remote.<name>.uploadpack:: The default program to execute on the remote side when fetching. See - option \--exec of linkgit:git-fetch-pack[1]. + option \--upload-pack of linkgit:git-fetch-pack[1]. remote.<name>.tagopt:: - Setting this value to --no-tags disables automatic tag following when fetching - from remote <name> + Setting this value to \--no-tags disables automatic tag following when + fetching from remote <name> remotes.<group>:: The list of remotes which are fetched by "git remote update
diff --git a/git-config.html b/git-config.html index e39570e..9be8b83 100644 --- a/git-config.html +++ b/git-config.html
@@ -1507,6 +1507,16 @@ </p> </dd> <dt> +format.pretty +</dt> +<dd> +<p> + The default pretty format for log/show/whatchanged command, + See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, + <a href="git-whatchanged.html">git-whatchanged(1)</a>. +</p> +</dd> +<dt> gc.aggressiveWindow </dt> <dd> @@ -1879,8 +1889,10 @@ <dd> <p> Controls which merge resolution program is used by - <a href="git-mergetool.html">git-mergetool(1)</a>. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". + <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "opendiff". Any other value is treated is custom merge tool + and there must be a corresponing mergetool.<tool>.cmd option. </p> </dd> <dt> @@ -1934,6 +1946,46 @@ </p> </dd> <dt> +mergetool.<tool>.cmd +</dt> +<dd> +<p> + Specify the command to invoke the specified merge tool. The + specified command is evaluated in shell with the following + variables available: <em>BASE</em> is the name of a temporary file + containing the common base of the files to be merged, if available; + <em>LOCAL</em> is the name of a temporary file containing the contents of + the file on the current branch; <em>REMOTE</em> is the name of a temporary + file containing the contents of the file from the branch being + merged; <em>MERGED</em> contains the name of the file to which the merge + tool should write the results of a successful merge. +</p> +</dd> +<dt> +mergetool.<tool>.trustExitCode +</dt> +<dd> +<p> + For a custom merge command, specify whether the exit code of + the merge command can be used to determine whether the merge was + successful. If this is not set to true then the merge target file + timestamp is checked and the merge assumed to have been successful + if the file has been updated, otherwise the user is prompted to + indicate the success of the merge. +</p> +</dd> +<dt> +mergetool.keepBackup +</dt> +<dd> +<p> + After performing a merge, the original file with conflict markers + can be saved as a file with a <tt>.orig</tt> extension. If this variable + is set to <tt>false</tt> then this file is not preserved. Defaults to + <tt>true</tt> (i.e. keep the backup files). +</p> +</dd> +<dt> pack.window </dt> <dd> @@ -2100,7 +2152,7 @@ <dd> <p> The default program to execute on the remote side when pushing. See - option --exec of <a href="git-push.html">git-push(1)</a>. + option --receive-pack of <a href="git-push.html">git-push(1)</a>. </p> </dd> <dt> @@ -2109,7 +2161,7 @@ <dd> <p> The default program to execute on the remote side when fetching. See - option --exec of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>. + option --upload-pack of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>. </p> </dd> <dt> @@ -2117,8 +2169,8 @@ </dt> <dd> <p> - Setting this value to --no-tags disables automatic tag following when fetching - from remote <name> + Setting this value to --no-tags disables automatic tag following when + fetching from remote <name> </p> </dd> <dt> @@ -2308,7 +2360,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 04-Mar-2008 12:05:57 UTC +Last updated 08-Mar-2008 09:29:57 UTC </div> </div> </body>
diff --git a/git-diff-tree.html b/git-diff-tree.html index 053b7db..bff9155 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -841,6 +841,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> +<p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p> </dd> <dt> --abbrev-commit @@ -1744,7 +1746,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 28-Feb-2008 00:25:39 UTC +Last updated 08-Mar-2008 09:29:57 UTC </div> </div> </body>
diff --git a/git-log.html b/git-log.html index eb1872e..949eb15 100644 --- a/git-log.html +++ b/git-log.html
@@ -820,6 +820,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> +<p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p> </dd> <dt> --abbrev-commit @@ -1908,7 +1910,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Mar-2008 01:59:58 UTC +Last updated 08-Mar-2008 09:29:59 UTC </div> </div> </body>
diff --git a/git-reflog.html b/git-reflog.html index 5564b5b..01a1ecb 100644 --- a/git-reflog.html +++ b/git-reflog.html
@@ -281,6 +281,7 @@ <div class="verseblock"> <div class="content">git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>…</div></div> +<p>git reflog delete ref@{specifier}…</p> <p>git reflog [show] [log-options] [<ref>]</p> <p>Reflog is a mechanism to record when the tip of branches are updated. This command is to manage the information recorded in it.</p> @@ -300,6 +301,8 @@ two moves ago", <tt>master@{one.week.ago}</tt> means "where master used to point to one week ago", and so on. See <a href="git-rev-parse.html">git-rev-parse(1)</a> for more details.</p> +<p>To delete single entries from the reflog, use the subcommand "delete" +and specify the _exact_ entry (e.g. “git reflog delete master@{2}”).</p> </div> <h2>OPTIONS</h2> <div class="sectionbody"> @@ -352,6 +355,25 @@ </p> </dd> <dt> +--updateref +</dt> +<dd> +<p> + Update the ref with the sha1 of the top reflog entry (i.e. + <ref>@{0}) after expiring or deleting. +</p> +</dd> +<dt> +--rewrite +</dt> +<dd> +<p> + While expiring or deleting, adjust each reflog entry to ensure + that the <tt>old</tt> sha1 field points to the <tt>new</tt> sha1 field of the + previous entry. +</p> +</dd> +<dt> --verbose </dt> <dd> @@ -375,7 +397,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:40 UTC +Last updated 08-Mar-2008 09:29:59 UTC </div> </div> </body> diff --git a/git-reflog.txt b/git-reflog.txt index f9bba36..047e3ce 100644 --- a/git-reflog.txt +++ b/git-reflog.txt
@@ -19,6 +19,8 @@ git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>... +git reflog delete ref@\{specifier\}... + git reflog [show] [log-options] [<ref>] Reflog is a mechanism to record when the tip of branches are @@ -43,6 +45,9 @@ point to one week ago", and so on. See linkgit:git-rev-parse[1] for more details. +To delete single entries from the reflog, use the subcommand "delete" +and specify the _exact_ entry (e.g. ``git reflog delete master@\{2\}''). + OPTIONS ------- @@ -75,6 +80,15 @@ --all:: Instead of listing <refs> explicitly, prune all refs. +--updateref:: + Update the ref with the sha1 of the top reflog entry (i.e. + <ref>@\{0\}) after expiring or deleting. + +--rewrite:: + While expiring or deleting, adjust each reflog entry to ensure + that the `old` sha1 field points to the `new` sha1 field of the + previous entry. + --verbose:: Print extra information on screen. diff --git a/git-rev-list.html b/git-rev-list.html index 419a03a..24ac9fc 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -364,6 +364,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> +<p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p> </dd> <dt> --abbrev-commit @@ -1204,7 +1206,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Mar-2008 01:59:59 UTC +Last updated 08-Mar-2008 09:30:00 UTC </div> </div> </body>
diff --git a/git-show.html b/git-show.html index f2a1a2f..3673c08 100644 --- a/git-show.html +++ b/git-show.html
@@ -311,6 +311,8 @@ <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. When omitted, the format defaults to <em>medium</em>. </p> +<p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p> </dd> <dt> --abbrev-commit @@ -762,7 +764,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:48 UTC +Last updated 08-Mar-2008 09:30:01 UTC </div> </div> </body>
diff --git a/git-stash.html b/git-stash.html index 0300f0c..bd6adae 100644 --- a/git-stash.html +++ b/git-stash.html
@@ -273,7 +273,7 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git-stash</em> (list | show [<stash>] | apply [<stash>] | clear) +<div class="content"><em>git-stash</em> (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>] | pop [<stash>]) <em>git-stash</em> [save [<message>]]</div></div> </div> <h2>DESCRIPTION</h2> @@ -365,6 +365,25 @@ be subject to pruning, and may be difficult or impossible to recover. </p> </dd> +<dt> +drop [<stash>] +</dt> +<dd> +<p> + Remove a single stashed state from the stash list. When no <tt><stash></tt> + is given, it removes the latest one. i.e. <tt>stash@{0}</tt> +</p> +</dd> +<dt> +pop [<stash>] +</dt> +<dd> +<p> + Remove a single stashed state from the stash list and apply on top + of the current working tree state. When no <tt><stash></tt> is given, + <tt>stash@{0}</tt> is assumed. See also <tt>apply</tt>. +</p> +</dd> </dl> </div> <h2>DISCUSSION</h2> @@ -463,7 +482,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 21-Feb-2008 02:29:24 UTC +Last updated 08-Mar-2008 09:30:02 UTC </div> </div> </body> diff --git a/git-stash.txt b/git-stash.txt index 48e6f5a..8dc35d4 100644 --- a/git-stash.txt +++ b/git-stash.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- [verse] -'git-stash' (list | show [<stash>] | apply [<stash>] | clear) +'git-stash' (list | show [<stash>] | apply [<stash>] | clear | drop [<stash>] | pop [<stash>]) 'git-stash' [save [<message>]] DESCRIPTION @@ -85,6 +85,17 @@ Remove all the stashed states. Note that those states will then be subject to pruning, and may be difficult or impossible to recover. +drop [<stash>]:: + + Remove a single stashed state from the stash list. When no `<stash>` + is given, it removes the latest one. i.e. `stash@\{0}` + +pop [<stash>]:: + + Remove a single stashed state from the stash list and apply on top + of the current working tree state. When no `<stash>` is given, + `stash@\{0}` is assumed. See also `apply`. + DISCUSSION ---------- diff --git a/git-whatchanged.html b/git-whatchanged.html index 58e3ee6..81c3686 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html
@@ -322,16 +322,6 @@ </p> </dd> <dt> ---pretty=<format> -</dt> -<dd> -<p> - Controls the output format for the commit logs. - <format> can be one of <em>raw</em>, <em>medium</em>, <em>short</em>, <em>full</em>, - and <em>oneline</em>. -</p> -</dd> -<dt> -m </dt> <dd> @@ -343,8 +333,336 @@ <p>However, it is not very useful in general, although it <strong>is</strong> useful on a file-by-file basis.</p> </dd> +<dt> +--pretty[=<em><format></em>] +</dt> +<dd> +<p> + Pretty-print the contents of the commit logs in a given format, + where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>, + <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. + When omitted, the format defaults to <em>medium</em>. +</p> +<p>Note: you can specify the default pretty format in the repository +configuration (see <a href="git-config.html">git-config(1)</a>).</p> +</dd> +<dt> +--abbrev-commit +</dt> +<dd> +<p> + Instead of showing the full 40-byte hexadecimal commit object + name, show only handful hexdigits prefix. Non default number of + digits can be specified with "--abbrev=<n>" (which also modifies + diff output, if it is displayed). +</p> +<p>This should make "--pretty=oneline" a whole lot more readable for +people using 80-column terminals.</p> +</dd> +<dt> +--encoding[=<encoding>] +</dt> +<dd> +<p> + The commit objects record the encoding used for the log message + in their encoding header; this option can be used to tell the + command to re-code the commit log message in the encoding + preferred by the user. For non plumbing commands this + defaults to UTF-8. +</p> +</dd> </dl> </div> +<h2>PRETTY FORMATS</h2> +<div class="sectionbody"> +<p>If the commit is a merge, and if the pretty-format +is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is +inserted before the <em>Author:</em> line. This line begins with +"Merge: " and the sha1s of ancestral commits are printed, +separated by spaces. Note that the listed commits may not +necessarily be the list of the <strong>direct</strong> parent commits if you +have limited your view of history: for example, if you are +only interested in changes related to a certain directory or +file.</p> +<p>Here are some additional details for each format:</p> +<ul> +<li> +<p> +<em>oneline</em> +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt><sha1> <title line></tt></pre> +</div></div> +<p>This is designed to be as compact as possible.</p> +</li> +<li> +<p> +<em>short</em> +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>commit <sha1> +Author: <author></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><title line></tt></pre> +</div></div> +</li> +<li> +<p> +<em>medium</em> +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>commit <sha1> +Author: <author> +Date: <date></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><title line></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><full commit message></tt></pre> +</div></div> +</li> +<li> +<p> +<em>full</em> +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>commit <sha1> +Author: <author> +Commit: <committer></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><title line></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><full commit message></tt></pre> +</div></div> +</li> +<li> +<p> +<em>fuller</em> +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>commit <sha1> +Author: <author> +AuthorDate: <date & time> +Commit: <committer> +CommitDate: <date & time></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><title line></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><full commit message></tt></pre> +</div></div> +</li> +<li> +<p> +<em>email</em> +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>From <sha1> <date> +From: <author> +Date: <date & time> +Subject: [PATCH] <title line></tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt><full commit message></tt></pre> +</div></div> +</li> +<li> +<p> +<em>raw</em> +</p> +<p>The <em>raw</em> format shows the entire commit exactly as +stored in the commit object. Notably, the SHA1s are +displayed in full, regardless of whether --abbrev or +--no-abbrev are used, and <em>parents</em> information show the +true parent commits, without taking grafts nor history +simplification into account.</p> +</li> +<li> +<p> +<em>format:</em> +</p> +<p>The <em>format:</em> format allows you to specify which information +you want to show. It works a little bit like printf format, +with the notable exception that you get a newline with <em>%n</em> +instead of <em>\n</em>.</p> +<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> +would show something like this:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago +The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< +</tt></pre> +</div></div> +<p>The placeholders are:</p> +<ul> +<li> +<p> +<em>%H</em>: commit hash +</p> +</li> +<li> +<p> +<em>%h</em>: abbreviated commit hash +</p> +</li> +<li> +<p> +<em>%T</em>: tree hash +</p> +</li> +<li> +<p> +<em>%t</em>: abbreviated tree hash +</p> +</li> +<li> +<p> +<em>%P</em>: parent hashes +</p> +</li> +<li> +<p> +<em>%p</em>: abbreviated parent hashes +</p> +</li> +<li> +<p> +<em>%an</em>: author name +</p> +</li> +<li> +<p> +<em>%ae</em>: author email +</p> +</li> +<li> +<p> +<em>%ad</em>: author date +</p> +</li> +<li> +<p> +<em>%aD</em>: author date, RFC2822 style +</p> +</li> +<li> +<p> +<em>%ar</em>: author date, relative +</p> +</li> +<li> +<p> +<em>%at</em>: author date, UNIX timestamp +</p> +</li> +<li> +<p> +<em>%ai</em>: author date, ISO 8601 format +</p> +</li> +<li> +<p> +<em>%cn</em>: committer name +</p> +</li> +<li> +<p> +<em>%ce</em>: committer email +</p> +</li> +<li> +<p> +<em>%cd</em>: committer date +</p> +</li> +<li> +<p> +<em>%cD</em>: committer date, RFC2822 style +</p> +</li> +<li> +<p> +<em>%cr</em>: committer date, relative +</p> +</li> +<li> +<p> +<em>%ct</em>: committer date, UNIX timestamp +</p> +</li> +<li> +<p> +<em>%ci</em>: committer date, ISO 8601 format +</p> +</li> +<li> +<p> +<em>%e</em>: encoding +</p> +</li> +<li> +<p> +<em>%s</em>: subject +</p> +</li> +<li> +<p> +<em>%b</em>: body +</p> +</li> +<li> +<p> +<em>%Cred</em>: switch color to red +</p> +</li> +<li> +<p> +<em>%Cgreen</em>: switch color to green +</p> +</li> +<li> +<p> +<em>%Cblue</em>: switch color to blue +</p> +</li> +<li> +<p> +<em>%Creset</em>: reset color +</p> +</li> +<li> +<p> +<em>%m</em>: left, right or boundary mark +</p> +</li> +<li> +<p> +<em>%n</em>: newline +</p> +</li> +</ul> +</li> +</ul> +</div> <h2>Examples</h2> <div class="sectionbody"> <dl> @@ -384,7 +702,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:58 UTC +Last updated 08-Mar-2008 09:30:02 UTC </div> </div> </body>
diff --git a/git-whatchanged.txt b/git-whatchanged.txt index 54947b6..a6e7bd4 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt
@@ -38,11 +38,6 @@ Show git internal diff output, but for the whole tree, not just the top level. ---pretty=<format>:: - Controls the output format for the commit logs. - <format> can be one of 'raw', 'medium', 'short', 'full', - and 'oneline'. - -m:: By default, differences for merge commits are not shown. With this flag, show differences to that commit from all @@ -51,6 +46,10 @@ However, it is not very useful in general, although it *is* useful on a file-by-file basis. +include::pretty-options.txt[] + +include::pretty-formats.txt[] + Examples -------- git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::
diff --git a/pretty-options.txt b/pretty-options.txt index 973d8dd..6d66c74 100644 --- a/pretty-options.txt +++ b/pretty-options.txt
@@ -4,6 +4,9 @@ where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw' and 'format:<string>'. When omitted, the format defaults to 'medium'. ++ +Note: you can specify the default pretty format in the repository +configuration (see linkgit:git-config[1]). --abbrev-commit:: Instead of showing the full 40-byte hexadecimal commit object
diff --git a/technical/api-run-command.html b/technical/api-run-command.html index 67e1b63..2c0c216 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html
@@ -448,9 +448,10 @@ </div></div> <div class="literalblock"> <div class="content"> -<pre><tt>.stdout_to_stderr: stdout of the child is redirected to the - parent's stderr (i.e. *not* to what .err or - .no_stderr specify).</tt></pre> +<pre><tt>.stdout_to_stderr: stdout of the child is redirected to its + stderr. This happens after stderr is itself redirected. + So stdout will follow stderr to wherever it is + redirected.</tt></pre> </div></div> </li> </ol> @@ -563,7 +564,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Mar-2008 02:00:01 UTC +Last updated 08-Mar-2008 09:30:02 UTC </div> </div> </body>
diff --git a/technical/api-run-command.txt b/technical/api-run-command.txt index fde3b45..c364a22 100644 --- a/technical/api-run-command.txt +++ b/technical/api-run-command.txt
@@ -111,9 +111,10 @@ .no_stdin, .no_stdout, .no_stderr: The respective channel is redirected to /dev/null. - .stdout_to_stderr: stdout of the child is redirected to the - parent's stderr (i.e. *not* to what .err or - .no_stderr specify). + .stdout_to_stderr: stdout of the child is redirected to its + stderr. This happens after stderr is itself redirected. + So stdout will follow stderr to wherever it is + redirected. To modify the environment of the sub-process, specify an array of string pointers (NULL terminated) in .env:
